Merge "Add class for service discovery using DNS SRV records"